Skip to content

Update headers for files copied from non ASF projects and update LICENSE #1562

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
May 14, 2025

Conversation

jbonofre
Copy link
Member

This PR removes the ASF header in the files copied from non ASF projects (but ASLv2 licensed).

It also updates LICENSE with files not actually copied (but created in Apache Polaris).

@jbonofre
Copy link
Member Author

@justinmclean Can you please take a look, regarding your comment on Incubator general mailing list ? Thanks !

@jbonofre
Copy link
Member Author

I will update spotless configuration to avoid to "force" ASF header (that's the reason why the header has been changed).

@@ -37,7 +37,7 @@ if (!project.extra.has("duplicated-project-sources")) {
spotless {
kotlinGradle {
ktfmt().googleStyle()
licenseHeaderFile(rootProject.file("codestyle/copyright-header-java.txt"), "$")
// licenseHeaderFile(rootProject.file("codestyle/copyright-header-java.txt"), "$")
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Accidental?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

JB explained to me that this is to prevent spotlessApply from changing the headers back to ASF from dremio. We'll need to figure out how to get the plugin to allow for multiple headers.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's intentional: with that, spotless:apply "overwrites" all header with ASF header, which is wrong as we have to keep the original header in case of code copy.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@jbonofre mind bringing this back?
There is targetExcludeIfContentContains/Regex

@jbonofre jbonofre requested a review from singhpk234 as a code owner May 14, 2025 11:21
@github-project-automation github-project-automation bot moved this from PRs In Progress to Ready to merge in Basic Kanban Board May 14, 2025
@jbonofre jbonofre merged commit 1baef0e into apache:main May 14, 2025
6 checks passed
@github-project-automation github-project-automation bot moved this from Ready to merge to Done in Basic Kanban Board May 14, 2025
@jbonofre jbonofre deleted the fix-asf-header branch May 14, 2025 19:06
jbonofre added a commit that referenced this pull request May 14, 2025
@jbonofre jbonofre added this to the 0.10.0-beta milestone May 14, 2025
snazy added a commit to snazy/polaris that referenced this pull request May 22, 2025
* Fix header in the gradle-wrapper.properties (apache#1587)

* Refactor GenericTableCatalog to support generic table federation (apache#1579)

* initial commit

* stable

* javadocs

* autolint

* changes per review

* Update headers for files copied from non ASF projects and update LICENSE (apache#1562)

* [Policy Store] Enforce regex requirement for policy name (apache#1583)

* Enforce regex requirement for policy name

* enable validation in open api builder

* FIx nit

* Include LICENSE, NOTICE, DISCLAIMER files in the docker images (apache#1588)

* main: Update swagger to v1.6.16 (apache#1594)

* Eliminate usage of CatalogHandlers; introduce CatalogHandlerUtils (apache#1576)

* compiles

* wire it up

* De-static, add config

* autolint

* license entry

* cut over

* pull

* revert helm doc

* autolint

* Allow realm context resolution to execute blocking calls (apache#1591)

* main: Update dependency com.adobe.testing:s3mock-testcontainers to v4.3.0 (apache#1597)

* Fix header in helm chart (apache#1560)

* Following vote/discussion on the Incubator general mailing list, NOTICE now contains part of Nessie NOTICE. (apache#1565)

* In binary distributions, now we group the artifacts and we add BSD/MIT licenses inline (apache#1573)

* Better null-safety for check against unsafe catalog configs (apache#1584)

Better null-safety for check against unsafe catalog configs

* Add support for federated principal and role with block for manual role assignment (apache#1353)

* Add support for federated principal and role with block for manual role assignment

* Update spec to distinguish federated and non-federated entities

* Changed builder to allow setting federated status twice

* Revert spec changes - add 'federated' property back to Principal entity

* Fixed builder to remove federated property

* Removed unnecessary openapi config flags

* Fix compilation issue in test

* Remove federated flag from principal entity

* Fixed builder oversight

* Fix compilation failures and rebase on main

* Remove verbose terminal output for admin tool (apache#1598)

* Site: Use the overview page as the home page (apache#1605)

* Include only relevant information from Picocli NOTICE as it doesn't apply in Polaris (as we use binary package, not source package) (apache#1561)

* Site: Simplified doc for spark download (apache#1608)

* main: Update dependency software.amazon.awssdk:bom to v2.31.45 (apache#1607)

* main: Update registry.access.redhat.com/ubi9/openjdk-21-runtime Docker tag to v1.22-1.1747241886 (apache#1603)

* main: Update dependency boto3 to v1.38.18 (apache#1592)

* merge fix

---------

Co-authored-by: JB Onofré <[email protected]>
Co-authored-by: Eric Maynard <[email protected]>
Co-authored-by: Honah (Jonas) J. <[email protected]>
Co-authored-by: Mend Renovate <[email protected]>
Co-authored-by: Alexandre Dutra <[email protected]>
Co-authored-by: Michael Collado <[email protected]>
Co-authored-by: Yufei Gu <[email protected]>
Co-authored-by: MonkeyCanCode <[email protected]>
adnanhemani pushed a commit to adnanhemani/polaris that referenced this pull request May 22, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants